F66: Refactor loading.