more PSR-2 changes

done, I think