Clean up and fix NumberBase