Number refactor