fix all PSR-2 issues