adjust to style guide