#1623 - Refactor pull request

References pull request #91