tags refactoring