Made the calculator more oopy