changes to try and conform to style guide