small clean-ups in REST runner