General cleanup.

General stylistic cleanup.