Updated files to reflect pull request comments