Cleanup and some sparse comments.