diff --git a/internal/config/config.go b/internal/config/config.go
index d25830e..c120a58 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -96,11 +96,10 @@ type (
 	}
 
 	SidebarConfig struct {
-		// WidthPercent is the percentage (%) of the total
-		// window width that the guilds tree sidebar occupies
-		WidthPercent   int                  `toml:"width_percent"`
-		Markers        SidebarMarkersConfig `toml:"markers"`
-		Indents        SidebarIndentsConfig `toml:"indents"`
+		// WidthPercent is the percentage of the total window width that the guilds tree (sidebar) occupies.
+		WidthPercent int                  `toml:"width_percent"`
+		Markers      SidebarMarkersConfig `toml:"markers"`
+		Indents      SidebarIndentsConfig `toml:"indents"`
 	}
 
 	Config struct {
diff --git a/internal/ui/chat/model.go b/internal/ui/chat/model.go
index 9b43fb4..414c825 100644
--- a/internal/ui/chat/model.go
+++ b/internal/ui/chat/model.go
@@ -84,15 +84,10 @@ func NewModel(app *tview.Application, cfg *config.Config, token string) *Model {
 	m.composer = newComposer(cfg, m)
 	m.channelsPicker = newChannelsPicker(cfg, m)
 
-	identifyProps := http.IdentifyProperties()
-	gateway.DefaultIdentity = identifyProps
-	gateway.DefaultPresence = &gateway.UpdatePresenceCommand{
-		Status: m.cfg.Status,
-	}
-
-	id := gateway.DefaultIdentifier(token)
-	id.Compress = false
-	id.LargeThreshold = 0
+	id := gateway.NewIdentifier(gateway.IdentifyCommand{
+		Token:      token,
+		Properties: http.IdentifyProperties(),
+	})
 
 	session := session.NewCustom(id, http.NewClient(token), handler.New())
 	state := state.NewFromSession(session, defaultstore.New())