Codestandards fixed conforming PSR