Code optimized further.