Update to match code changes in dut. Minor cleanup.