small tidy up
more tidy up