cleanup
more cleanup
fixed a test