Restyling according to PSR1/PSR2