Cleanup up imports and other minor stuff

Prepared the code to be tested with for driving and shooting with the
second robot.