Comments and coding style fixes.