Refactoring of numeric_vs_choices and numeric_vs_numeric graph classes