refactor house loading