Some adaptations to Symfony2 coding style