More PSR2 coding style fixes