refactor to be inline with style guide