Modify formatting to PSR-2