Made edits per comments on pull request. semantic changes