React refactoring, off the hook(s)!