Tidied up Calculator.php