Very minor cleanup
Lots more cleanup