Tidying up some tables