optimized coding style to PSR-2