Improve the Tagger code