Big Checkstyle cleanup