cleanup and added some tags