refactoring(loading)