scaladoc for Annotator added, unused methods deleted, construction renamed to annotation