minor cleanup
more cleanup