Updated to fit style guide