Some Fix to PSR-2 code style