Some cleaning up and edits.