Code cleanup, more comments.