Fixing PS2 invalid files
Fixing some PSR2 errors