Clean-up
Fix org-mode keybindings