The 6 keys rollover will not be enough for a joystick. Removing that code
Small refactorings