Continuing refactoring of Keyboard.py