Another cleanup round + way more parallelization :)