Some style guide changes