make it conform better to the style guide