Rework to match PSR1/PSR2 standards.