Some comment code cleaning.