Auto refresh minor refactor.