Pep8 fixes and changed the keymap