began refactoring of structured factors