minor code cleanups
minor code cleanups
some more comments