a few Checkstyle fixes
Merge branch 'develop' of https://github.com/NPTricky/ccd-colon-colon.git into develop