Tidying up some things