refactor with style guide