Reduce code violations.
Merge pull request #117 from jmpascal/master

Reduce code violations