Improve comments area logic