refactor: update loading