Updated to fix style guide