Machine processing refactor