Fix missing data- es.
Code review changes.