Code Cleanup

Ran import cleanup and debugged keyboard input a bit