More tidying up