refactoring to PSR2 standard