improve the comment management