Formatting stuff, plus cleanup