Clean up and correct emacs file