Wh modular refactoring