Codestyle fixes

Fixed some line length issues, PSR compliance