Migrated to NumFormatUtil