Tidy up running options