Merge pull request #25 from grayclhn/tweak-formatting

A sequence of edits that change the layout in minor ways.