Some cleanup but mostly comments.