small clean up
minor refactoring
fix KeyboardManager
Merge pull request #137 from topilski/master

Refactoring