2076: refactor