diff --git a/src/labels.rs b/src/gmail_client.rs
similarity index 68%
rename from src/labels.rs
rename to src/gmail_client.rs
index 2dd2227..00eb2fa 100644
--- a/src/labels.rs
+++ b/src/gmail_client.rs
@@ -1,8 +1,7 @@
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
 use google_gmail1::{
     Gmail,
-    api::Label,
     hyper_rustls::{HttpsConnector, HttpsConnectorBuilder},
     hyper_util::{
         client::legacy::{Client, connect::HttpConnector},
@@ -11,30 +10,28 @@ use google_gmail1::{
     yup_oauth2::{ApplicationSecret, InstalledFlowAuthenticator, InstalledFlowReturnMethod},
 };
 
-use crate::{Credential, Result};
+use crate::{Credential, Error, Result};
 
 /// Default for the maximum number of results to return on a page
-pub const DEFAULT_MAX_RESULTS: &str = "10";
+pub const DEFAULT_MAX_RESULTS: &str = "200";
 
 /// Struct to capture configuration for List API call.
-pub struct Labels {
+pub struct GmailClient {
     hub: Gmail<HttpsConnector<HttpConnector>>,
-    label_list: Vec<Label>,
-    label_map: HashMap<String, String>,
+    label_map: BTreeMap<String, String>,
 }
 
-impl std::fmt::Debug for Labels {
+impl std::fmt::Debug for GmailClient {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("Labels")
-            .field("label_list", &self.label_list)
             .field("label_map", &self.label_map)
             .finish()
     }
 }
 
-impl Labels {
+impl GmailClient {
     /// Create a new List struct and add the Gmail api connection.
-    pub async fn new(credential: &str, show: bool) -> Result<Self> {
+    pub async fn new(credential: &str) -> Result<Self> {
         let (config_dir, secret) = {
             let config_dir = crate::utils::assure_config_dir_exists("~/.cull-gmail")?;
 
@@ -63,35 +60,36 @@ impl Labels {
         .unwrap();
 
         let hub = Gmail::new(client, auth);
+        let label_map = GmailClient::get_label_map(&hub).await?;
 
+        Ok(GmailClient { hub, label_map })
+    }
+
+    /// Create a new List struct and add the Gmail api connection.
+    async fn get_label_map(
+        hub: &Gmail<HttpsConnector<HttpConnector>>,
+    ) -> Result<BTreeMap<String, String>> {
         let call = hub.users().labels_list("me");
-        let (_response, list) = call.doit().await.map_err(Box::new)?;
+        let (_response, list) = call
+            .add_scope("https://mail.google.com/")
+            .doit()
+            .await
+            .map_err(Box::new)?;
 
         let Some(label_list) = list.labels else {
-            return Ok(Labels {
-                hub,
-                label_list: Vec::new(),
-                label_map: HashMap::new(),
-            });
+            return Err(Error::NoLabelsFound);
         };
 
-        let mut label_map = HashMap::new();
+        let mut label_map = BTreeMap::new();
         for label in &label_list {
             if label.id.is_some() && label.name.is_some() {
                 let name = label.name.clone().unwrap();
                 let id = label.id.clone().unwrap();
-                if show {
-                    log::info!("{name}: {id}")
-                }
                 label_map.insert(name, id);
             }
         }
 
-        Ok(Labels {
-            hub,
-            label_list,
-            label_map,
-        })
+        Ok(label_map)
     }
 
     /// Return the id for the name from the labels map.
@@ -99,4 +97,11 @@ impl Labels {
     pub fn get_label_id(&self, name: &str) -> Option<String> {
         self.label_map.get(name).cloned()
     }
+
+    /// Show the label names and related id.
+    pub fn show_label(&self) {
+        for (name, id) in self.label_map.iter() {
+            log::info!("{name}: {id}")
+        }
+    }
 }