refactoring Home