Cleanup and more comments.