more cleanup and another theme