7249: refactor