Refactored to conform with style guide