Quick clean-up of styleguide stuff.

Merging in some minor style guide updates.