Updating code according to PSR-2