A little bit of PSR-2

No functional changes, just some PSR-2 formatting :)