Annotation parsing from VCF cleaned up