motor loading refactoring