Optimize some more