Optimize 30% faster
Cleanups