cleaned up type headers