converted to PSR coding standards