Small cleanups.
Mainly whitespace cleanups.