minor cleanup
more minor cleanup