refactored home