Fix some inspection issues
Merge branch 'master' of github.com:rickard2/utcw