Update to follow style guide