Small refactoring of keyboard bindings (first part)