Updated StringCalculator