Improve Twig syntax
Fix checkstyle