loader refactor