Cleanup and comments.