Clean up init-keybindings.el a bit