Cleanup, add comments.