Checkstyle cleanup

mostly compiler warning cleanup