Cleans up the annotations functions.
Collated Sre output in class.
Merge branch 'combine-sre-output'