Checkstyle cleanup and comments