Refactor using PSR1/PSR2 rules

PSR1/PSR2 for code, but not for all tests