large cleanup of indentation, addition of Variant::varCigar