Tidied up the calculator. Improved commenting