Tidying up runner behavior