tidying everything up