Optimize a little