some more changes for fix the format to PSR-2