Revert the Symfony related changes
Fix the coding style