cleanup
more cleanup
simpolifing even more...
tests passing