diff --git a/src/client.rs b/src/client.rs
index 89ef9c7..8d8d924 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -17,7 +17,6 @@ use gio::{
 };
 use glib::{Bytes, Priority, Uri};
 
-pub const DEFAULT_PORT: u16 = 1965;
 pub const DEFAULT_TIMEOUT: u32 = 10;
 
 pub struct Client {
@@ -51,7 +50,7 @@ impl Client {
         certificate: Option<TlsCertificate>,
         callback: impl Fn(Result<Response, Error>) + 'static,
     ) {
-        match crate::gio::network_address::from_uri(&uri, DEFAULT_PORT) {
+        match crate::gio::network_address::from_uri(&uri, crate::DEFAULT_PORT) {
             Ok(network_address) => {
                 self.socket.connect_async(
                     &network_address.clone(),
diff --git a/src/client/certificate/scope.rs b/src/client/certificate/scope.rs
index 5c25cc2..0d5cd20 100644
--- a/src/client/certificate/scope.rs
+++ b/src/client/certificate/scope.rs
@@ -1,7 +1,7 @@
 pub mod error;
 pub use error::Error;
 
-use crate::client::DEFAULT_PORT;
+use crate::DEFAULT_PORT;
 use gio::NetworkAddress;
 use glib::{GString, Uri, UriFlags, UriHideFlags};
 
diff --git a/src/lib.rs b/src/lib.rs
index 350fdd6..868a4f3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,10 @@
 pub mod client;
 pub mod gio;
 
+// Main API
+
 pub use client::Client;
+
+// Global defaults
+
+pub const DEFAULT_PORT: u16 = 1965;