Yes, I need to improve this Case class which is there to deduplicate what is done with the various combinations of those variables.