Some more comments cleanup.