little bits of cleanup