add comments, light refactoring in twig parameters listener