NumberTheory refactoring