Final processing refactoring