Clean up and fix