Cleaning up variant logic

[Janther]

Main changes:

• we return early if the variant is a Terminal node since we don't have to calculate new loc or comments and avoid having to check again at the end.
• storing variant and variantKind so we don't have to check every time.
• adding a printVariant helper to standardise the printing of variants