- Refactor in keyboad class, tests and index usage