Refactored tag