Various style corrections.