Cleanups, comments.