comments changed to follow style guide