clean up some syntax irregularities in util files