Twig clean up