refactor twig files