[cleanup] little bits of cleanup here and there