Improve comments mode