cleaned up type name and import