next of walls refactoring