Enhance the comments