Code tweaks
Switch to full Symfony CS