Comments and coding style fixes
Another bunch of indentation changes.