minor cleanups and comments