Update code for PSR2 compliance.