PSR2 for the rest of the stuff I somehow didn't touch