tidy up ... again