Improve layout of comments