Modify calculator structure