More optimizations

About 8% speed-up.