Updates to reflect pull request code review