Revised edits based on feedback

Revised version of previous pull request. See commit #1527cea for detail on new revisions