Refactoring in several processing files