Optimized code further