Tidying up program options