Fix CS PSR1 PSR2 compliant