Clean up, add comments.