Concurrency and Refactor+Cleanup