Code refactor pull request