Refactor change