refactor per pull request comments