2079: refactor