CHG clean code, threads, all