1620 | Refactor pull request #488

Refactor pull request #488