Changed some comments from the template