Small changes to Maneuver
Finished refactoring Maneuver