Cleanup
Bit of frobbing, CPU maxes out on actual work now mostly