#540 address comments pull request 533

Proposed changes

This close #540 addressing the comments for #514

[ ] Related issue appears at beginning of pull request title with pound sign, and title describes the changes being proposed.
[ ] Related issue is linked in pull request description using closing keywords.
[ ] The appropriate label has been chosen for this pull request.
[ ] The correct project has been selected for this pull request.
[ ] All commits in this branch, including merge commits, begin with the issue number and a pound sign.
[ ] Tests have been added, where appropriate; or, no tests are relevant for this pull request.
[ ] This pull request contains UI changes, and screenshots of those UI images appear below; or, this pull request contains no UI changes.