style guide clean up