trying to tidy up