made edits per recommendations of Refactor Cop.