Refactored choices_vs_numeric class