make keymaps necessary
Remove unused method
Some formatting