Updated code based on feedback from code review.
Merge pull request #1 from MorganDawe/MorganDawe-7.x-WRLC-66

Updated code based on feedback from code review.