Slight tag cleanup