Some fixes

The Symfony and CMF docs have a strict rule about line length