Properly converting to PSR-4