Updated to PSR2 standards