(home) refactoring