yet another wall refactoring