Optimize a few parts