Key binding refactoring