tidy up and stuff