more code cleanups and comments