All checkstyles finished
Merge branch 'checkstyle'