cleanup validator a little more