Cleaned up keystrokes