Cleaning up runner a bit