code cleanups, comments