Clean up, comment additions.