Refactored Keyboard/Mouse