improve "@type"