Remove the type element
Add TagType
clean code