Following the Symfony2 Standard and cleaned the code