2447: refactor