Minor cleanup

Added minor cleanup, commented out unnessiary Windows key bindings.