tidy up once more