7403: refactor