Clean up and and comments.