PSR2 compliance changes
PSR2 compliance changes