first pass at cleanup
seems to be working - though still more work to be done