more tidy up