load refactoring