Optimize slightly