PMD/Checkstyle cleanup