Refactor RefreshService