corrections made for PSR-2

splits long lines

fixes scrutinizer suggestions

fixes scrutinizer suggestions