changelog for PR #1
Refactor code from PR #1