Rework runner to be cleaner