start of tidy up