Use Tagger helper class for everything.
Tagger cleanups and punctuation.
Remove redundant includes.