refactor the tags