2433: refactor