Tag construction cleanup

See 3 results