diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 09555dd..0bd8739 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -577,13 +577,6 @@ Style/UnneededPercentQ:
   Exclude:
     - 'spec/models/notice_spec.rb'
 
-# Offense count: 6
-# Cop supports --auto-correct.
-Style/WhenThen:
-  Exclude:
-    - 'app/models/problem.rb'
-    - 'lib/hoptoad.rb'
-
 # Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: WordRegex.
diff --git a/app/models/problem.rb b/app/models/problem.rb
index 9b4dcfc..4b00edd 100644
--- a/app/models/problem.rb
+++ b/app/models/problem.rb
@@ -216,11 +216,11 @@ class Problem
 
   def self.ordered_by(sort, order)
     case sort
-    when "app";            order_by(["app_name", order])
-    when "message";        order_by(["message", order])
-    when "last_notice_at"; order_by(["last_notice_at", order])
-    when "last_deploy_at"; order_by(["last_deploy_at", order])
-    when "count";          order_by(["notices_count", order])
+    when "app" then            order_by(["app_name", order])
+    when "message" then        order_by(["message", order])
+    when "last_notice_at" then order_by(["last_notice_at", order])
+    when "last_deploy_at" then order_by(["last_deploy_at", order])
+    when "count" then          order_by(["notices_count", order])
     else raise("\"#{sort}\" is not a recognized sort")
     end
   end
diff --git a/lib/hoptoad.rb b/lib/hoptoad.rb
index 75e845d..2e4a150 100644
--- a/lib/hoptoad.rb
+++ b/lib/hoptoad.rb
@@ -17,7 +17,7 @@ module Hoptoad
 
     def self.get_version_processor(version)
       case version
-      when /2\.[01234]/; Hoptoad::V2
+      when /2\.[01234]/ then Hoptoad::V2
       else;            raise ApiVersionError
       end
     end
--
libgit2 0.21.2