annotator refactor