Cleaned up Keyboard class