more cleanup
even more minor cleanup