Cleaning up Code to PSR-2