refactor: cleanup variable namespace in IWRR code