PSR2 reformatting