refactored for brevity
completion, improved syntax, alternative keymap