Code Review - Refactor and fixes.
Merge pull request #1 from nigelgbanks/7.x-code-review

Code Review - Refactor and fixes.