refactored style to fit with style guide