Refactor House Group code