Improved template for comments