little more cleanup
Seems to work now