Formatting and minor modifications.