Little loader refactoring