Cleaned and added tags