Optimize more scripts