Several changes.

Mostly code style changes.