refactor with tags

this is to clean up some tag stuff