cleanup and simplify Runner::Space