conforming a bit closer to style guide