refacto
updated
parsing keybindings