Updating Code to PSR-2