more cleanup and nits.