7433: refactor