Some reformatting and minor changes.