refactoring some stuff
keyboard control