Refactored to style guide standards