First refactoring of ES