PSR2 Codestyle updates