tidy up as you go

tidy up as you go