Make keymap more manageable