More cleanups and parallelizations