Cleaning code

-inserted tags
-Cleaning code
-Uptimizing