EMACS: small changes
CLN: Just cleaning house