tagger code review & changes