Fix PSR2 for build success pass