Refactor in process