Various PHP coding style fixes