Clean up and comments.