Minor refactoring
Use noremap