License and checkstyle cleanup