Fixed bug in enrichment for when there are no annotations. Some small cleaning up