Clean up Runner slightly