Clean up and fix.