Refactor #home