Makes another set of PSR2 changes