Refact. home