more cleanup
more typing