annotate, cleanup