refactor Living