Refactor numerals
More refactoring of numerals