Changed class name from Calculate to Calculator