improved according to style guide