Futher optimizations

Even faster after removing one line.