Partial Refactoring of RobotManeuvers
More code refactoring