Cosmetic
Potential perf improvement for esmre