Some emacs cleanup