changed to PSR-2 coding style