improving comment clean up