Number refactoring