Refactor UpdateSeeking away (#64)