Cleanup

Cleanup of code and Control Pad