Misc tweaks and formatting to bring more in line with style guide