Some cleanup of the unittype properties