now conforming to PSR2 coding standard