more cleanup and changes