replace Number by int/uint where-ever possible