More code style updates.