Issue #5

Emacs also did some code-formatting.