cleaning up code in preparation for pull request