Refactored last pull request