diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb
index 54fea7e322d633895ffb81eb42b1b86c03829ba0..c121c02930f8f98bfc044b70100169cccc710644 100644
--- a/app/models/learning_object.rb
+++ b/app/models/learning_object.rb
@@ -24,18 +24,6 @@ class LearningObject
     @publisher ||= learning_object_repository.get_publisher(self)
   end
 
-  def like(user)
-    learning_object_repository.like user, self
-  end
-
-  def liked?(user)
-    learning_object_repository.liked? user, self
-  end
-
-  def dislike(user)
-    learning_object_repository.dislike user, self
-  end
-
   def subjects
     @subjects ||= learning_object_repository.get_subjects(self)
   end
@@ -48,6 +36,20 @@ class LearningObject
     get_metadata_value_of 'dc.subject.category'
   end
 
+  ## social actions
+  def like(user)
+    learning_object_repository.like user, self
+  end
+
+  def liked?(user)
+    learning_object_repository.liked? user, self
+  end
+
+  def dislike(user)
+    learning_object_repository.dislike user, self
+  end
+  ## end social actions
+
   def get_metadata_value_of key
     get_metadata_values_of(key).first
   end
@@ -61,6 +63,7 @@ class LearningObject
     values
   end
 
+  #TODO: move for Bitstream model
   def get_bitstream_retrievelink_of name
     values = @bitstreams.select { |v| v["bundleName"] == name }
     unless values.empty?
@@ -68,6 +71,7 @@ class LearningObject
     end
   end
 
+  #TODO: move for Bitstream model
   def get_bitstream_filename_of name
     values = @bitstreams.select { |v| v["bundleName"] == name }
     unless values.empty?
@@ -75,10 +79,12 @@ class LearningObject
     end
   end
 
+  #TODO: move for Bitstream model
   def get_retrievelink
     get_bitstream_retrievelink_of "ORIGINAL"
   end
 
+  #TODO: move for Bitstream model
   def get_filename
     get_bitstream_filename_of "ORIGINAL"
   end
@@ -89,7 +95,6 @@ class LearningObject
     self
   end
 
-
   private
 
   def defaults