refactor tag