Fixing PSR2 problems