Added dynamic tags
Cleaned Code