cleanup
more cleanup
test
fix names