Refactor. Try to get consistent keymap.