Refactoring number construction
Dang, thats even slower