Cleanup and some comments.