Clean up Type-Expression