making the codebase match the PSR2 codestyle