comment clean up