load() refactor