tests working, cleaning up
more cleaning