More optimizations
Cleanup