Slight refactoring

Still TODO: Keymaps uff