Code refactoring: tag identifiers