mostly fixed checkstyle for universe
more fixing check for universe