PSR2 Compliance, mostly