2067: refactor