Fix doc
Fix PSR2 violations
Fix PSR2 violations