Optimized a few lines