minor cleanup
more cleanups