Some code style corrections.