A few code sniffer changes
Merge pull request #12 from clairs/master

A few code sniffer changes