refactor walls