Fix comment spacing
Save Annotator class reference in guest, and use it