minor annotator refactoring