Some tidying up of options