Makes more PSR2 changes