finished tidying first part