Some cleanup and comments.