Refactoring States for BumperCar