tidying it up