Some cleanup and extra comments.