Added the refactoring commit to this pull request.