Some style and minor changes.