minor style fixes
minor code cleanups
more code cleanups