code cleanup on TagExtractor
code cleanup on TagExtractor