a bit more tidy up