Optimizing the code, and more.