Added Dynamic Tags
Cleaned Code