Refactored .emacs