Conform to style guide