Refactor ConstrainedWallGenerator