some final tidy up