Refactored method, added tag name.