Improve comment template