Minor changes.
Made the move walking logic more readable.