slightly less quick tidy up