Initial pass at style guide updates