Refactor home stuff related