-Calculator: Removed unneccessary variables