Cleaning up type value labels in modules