Cleanup/speedup

I think