Formatting changes now I've sorted out emacs' pain.