Cleanup & fix