#16: refactor change