Fix to coding standards.
More cleanups.
Merge branch 'master' of github.com:mlutfy/ca.bidon.reporterror