Code cleanup. Switch to PSR-4