Fine-tuned the RadixCalculator