merge style changes

This factors in some recent changes, but I had also made a number of changes before you graded the initial pull request. The current state of this project is a lot better.