More keybinding simplification