Cleanup.
Fix and cleanup.