More code style changes.