fix up format for PSR-2