more-refactoring-eh