Clean up and comment.