Standardize on direct use of the NumberFormat and turn CommodityFormat into a utility class