Changes to address feedback on pull request 280