refactor TreeAnnotator #197