PSR-2 compliance updates