general tidy up