Cleanups and more comments.