Commentary cleanup