Better PSR-ishness?