[M] Optimized code structure