Refactor Keyboard #3