refactor to comply style guide