Code quality fixes
More code quality fixes
Merge pull request #16 from robcaw/master

Code quality fixes