Improve generation of comments