diff --git a/app/models/todo.rb b/app/models/todo.rb
index 42faecdf7f2d9f4c6f2d50b9f4cccabbeb42bfbf..2792fa9b9a8a1c00a55fb470a30678a8e780935d 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -34,13 +34,6 @@ class Todo < ActiveRecord::Base
     action == BUILD_FAILED
   end
 
-  def action_name
-    case action
-    when Todo::ASSIGNED then 'assigned you'
-    when Todo::MENTIONED then 'mentioned you on'
-    end
-  end
-
   def body
     if note.present?
       note.note
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index 421885eef5b0c96137242f3cca52ae45cd4a219d..98f302d2f937dc769547f9cf9848d0091f41eddb 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -11,7 +11,7 @@
           - else
             (removed)
       %span.todo-label
-        = todo.action_name
+        = todo_action_name(todo)
         - if todo.target
           = todo_target_link(todo)
         - else
diff --git a/lib/api/todos.rb b/lib/api/todos.rb
index f45c0ae634ab462d15436f9aabe7043bf20eee58..db1f16cec592cb39d49024be58caa93785a6167a 100644
--- a/lib/api/todos.rb
+++ b/lib/api/todos.rb
@@ -14,11 +14,11 @@ module API
       #
       # Example Request:
       #  GET /todos
+      #
       get do
-        @todos = find_todos
-        @todos = paginate @todos
+        todos = find_todos
 
-        present @todos, with: Entities::Todo
+        present paginate(todos), with: Entities::Todo
       end
 
       # Mark todo as done
@@ -31,10 +31,10 @@ module API
       #  DELETE /todos/:id
       #
       delete ':id' do
-        @todo = current_user.todos.find(params[:id])
-        @todo.done
+        todo = current_user.todos.find(params[:id])
+        todo.done
 
-        present @todo, with: Entities::Todo
+        present todo, with: Entities::Todo
       end
 
       # Mark all todos as done
@@ -44,10 +44,10 @@ module API
       #  DELETE /todos
       #
       delete do
-        @todos = find_todos
-        @todos.each(&:done)
+        todos = find_todos
+        todos.each(&:done)
 
-        present @todos, with: Entities::Todo
+        present paginate(todos), with: Entities::Todo
       end
     end
   end