Disable twig debug mode
Rejig and add some comments