Small cleanup and initial Twig support