addressed code review issues
small code sniffer change
Merge pull request #3 from DannyJoris/7.x

addressed code review issues by Daniel Lamb