Refactoring boat movement.