Correcting some code review feedback.
Merge pull request #11 from MorganDawe/7.x-EMIC-119

Correcting some code review feedback.