Refactor to make rerender case clearer per review