More cleanup, comments.