Optimized a couple of things.