fixes for PSR2 after changing codebase