Refactoring for the move_forward and taxi object