Minor tweaks

Readability and style guide changes. Based on feedback from @tomsugden

Replaces #132