Tweak formatting, naming, tests, etc.