Added formatting for calc