Making requested changes to clean up pull request