Tidy a little the keybindings