Optimized slightly