refactor loaders