Made even more PSR-4ish