Refactor into a homesick castle