code cleanups
more cleanups