Formatting, spellcheck, cleanups, see #71