Some code style updates.