Tidying up an annotating