Coding standards fixed for PSR2