Cleanup.

Cleaned up a bit.