Minor cleanup and new runner