Fixing checkstyle/findbugs errors