Refactored StringCalculator. A new regex solution