Fixing coding style according to PSR