Syntax fixes to conform to PSR coding standard