some tidying