clean up tagger code