Changes in templates comments and blank lines