Moved keyboard code into KeyboardManager class