Reformat to match PSR-1 and PSR-2