diff --git a/game.rb b/game.rb
index <HASH>..<HASH> 100644
--- a/game.rb
+++ b/game.rb
@@ -47,16 +47,16 @@ class Grid
     cells << @storage[index - 1] unless beginning_of_row?(index)
     cells << @storage[index + 1] unless end_of_row?(index)
 
-    unless index < size
+    unless first_row?(index)
       cells << @storage[above(index - 1)] unless beginning_of_row?(index)
-      cells << @storage[above(index)]
       cells << @storage[above(index + 1)] unless end_of_row?(index)
+      cells << @storage[above(index)]
     end
 
     unless last_row?(index)
       cells << @storage[below(index) - 1] unless beginning_of_row?(index)
-      cells << @storage[below(index)]
       cells << @storage[below(index) + 1] unless end_of_row?(index)
+      cells << @storage[below(index)]
     end
 
     cells
@@ -94,6 +94,10 @@ class Grid
     (index + 1) % size == 0
   end
 
+  def first_row?(index)
+    index < size
+  end
+
   def last_row?(index)
     index >= (size * size - size)
   end
Minor changes for consistency

- And reordering to highlight duplication