7409: refactor