tidy up and new models for tags