Made edits according to comments on pull request