- Cleaned up dynamic tag generation