Matching changes to style guide