Refactor slightly pull request