Commmentary correction and removal useless twig function