diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index 2e2a91205..9a843c4d5 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -6,58 +6,57 @@ require 'spec_helper'
 require Rails.root.join("spec", "shared_behaviors", "relayable")
 
 describe Comment, :type => :model do
-  before do
-    @alices_aspect = alice.aspects.first
-    @status = bob.post(:status_message, :text => "hello", :to => bob.aspects.first.id)
-  end
+
+    let(:alices_aspect) { alice.aspects.first }
+    let(:status_bob)  { bob.post(:status_message, :text => "hello", :to => bob.aspects.first.id) }
+    let(:comment_alice) { alice.comment!(status_bob, "why so formal?") }
 
   describe 'comment#notification_type' do
-    let (:comment) { alice.comment!(@status, "why so formal?") }
 
     it "returns 'comment_on_post' if the comment is on a post you own" do
-      expect(comment.notification_type(bob, alice.person)).to eq(Notifications::CommentOnPost)
+      expect(comment_alice.notification_type(bob, alice.person)).to eq(Notifications::CommentOnPost)
     end
 
     it "returns 'also_commented' if the comment is on a post you participate to" do
-      eve.participate! @status
-      expect(comment.notification_type(eve, alice.person)).to eq(Notifications::AlsoCommented)
+      eve.participate! status_bob
+      expect(comment_alice.notification_type(eve, alice.person)).to eq(Notifications::AlsoCommented)
     end
 
     it 'returns false if the comment is not on a post you own and no one "also_commented"' do
-      comment = alice.comment!(@status, "I simply felt like issuing a greeting.  Do step off.")
-      expect(comment.notification_type(eve, alice.person)).to be false
+      expect(comment_alice.notification_type(eve, alice.person)).to be false
     end
 
     context "also commented" do
+      let(:comment_eve) { eve.comment!(status_bob, "I also commented on the first user's post") }
+
       before do
-        alice.comment!(@status, "a-commenta commenta")
-        @comment = eve.comment!(@status, "I also commented on the first user's post")
+        comment_alice
       end
 
       it 'does not return also commented if the user commented' do
-        expect(@comment.notification_type(eve, alice.person)).to eq(false)
+        expect(comment_eve.notification_type(eve, alice.person)).to eq(false)
       end
 
       it "returns 'also_commented' if another person commented on a post you commented on" do
-        expect(@comment.notification_type(alice, alice.person)).to eq(Notifications::AlsoCommented)
+        expect(comment_eve.notification_type(alice, alice.person)).to eq(Notifications::AlsoCommented)
       end
     end
   end
 
   describe 'User#comment' do
     it "should be able to comment on one's own status" do
-      alice.comment!(@status, "Yeah, it was great")
-      expect(@status.reload.comments.first.text).to eq("Yeah, it was great")
+      bob.comment!(status_bob, "sup dog")
+      expect(status_bob.reload.comments.first.text).to eq("sup dog")
     end
 
     it "should be able to comment on a contact's status" do
-      bob.comment!(@status, "sup dog")
-      expect(@status.reload.comments.first.text).to eq("sup dog")
+      comment_alice
+      expect(status_bob.reload.comments.first.text).to eq("why so formal?")
     end
 
     it 'does not multi-post a comment' do
       expect {
-        alice.comment!(@status, 'hello')
+        comment_alice
       }.to change { Comment.count }.by(1)
     end
   end
@@ -65,19 +64,21 @@ describe Comment, :type => :model do
   describe 'counter cache' do
     it 'increments the counter cache on its post' do
       expect {
-        alice.comment!(@status, "oh yeah")
+        comment_alice
       }.to change{
-        @status.reload.comments_count
+        status_bob.reload.comments_count
       }.by(1)
     end
   end
 
+# hier weiter
+
   describe 'xml' do
     before do
       @commenter = FactoryGirl.create(:user)
       @commenter_aspect = @commenter.aspects.create(:name => "bruisers")
-      connect_users(alice, @alices_aspect, @commenter, @commenter_aspect)
-      @post = alice.post :status_message, :text => "hello", :to => @alices_aspect.id
+      connect_users(alice, alices_aspect, @commenter, @commenter_aspect)
+      @post = alice.post :status_message, :text => "hello", :to => alices_aspect.id
       @comment = @commenter.comment!(@post, "Fool!")
       @xml = @comment.to_xml.to_s
     end
@@ -125,7 +126,7 @@ describe Comment, :type => :model do
       @object_on_remote_parent = @local_luke.comment!(@remote_parent, "Yeah, it was great")
     end
 
-    let(:build_object) { alice.build_comment(:post => @status, :text => "why so formal?") }
+    let(:build_object) { alice.build_comment(:post => status_bob, :text => "why so formal?") }
     it_should_behave_like 'it is relayable'
   end