Clean up and add org mode for emacs