More optimizations

Improvement by ~5%