refactoring henry