More house refactoring