Fix PSR2 code errors

There are some long line warnings there were not addressed