began refactoring DAQ