Tidying up operations