Remove dependency on mousetrap
Add part as variable to keystroke