Clean + Fix concurrency