updated to PSR2 standards