Reformat like PSR1/2