Update for PSR2 compliance.