Refactor pull request #13