Various small refactorings to Variant Reporting

I agree with Adam's suggestion. Much easier to read that way.