Formatting/style guide prep

This is sort of a mix of formatting and prep work for the style guide changes.