426: refactor