Refactoring
Refactoring of Numerals