#3 some tidying