some more tidy up