Cleaning to code to PSR-2