Some code style changes.