Working on tidying up the options