322: refactor