Small Cleanup.