Some cleaning up in tags