refactor & tidy twig module
tweak