diff --git a/config.go b/config.go
index e556b90..9bb7b3b 100644
--- a/config.go
+++ b/config.go
@@ -11,8 +11,6 @@ const userAgent = "" +
 	"AppleWebKit/537.36 (KHTML, like Gecko) " +
 	"Chrome/92.0.4515.131 Safari/537.36"
 
-var conf *config
-
 type keybindingsChannelsTree struct {
 	Focus string
 }
diff --git a/discord.go b/discord.go
index 7e19035..5a0addd 100644
--- a/discord.go
+++ b/discord.go
@@ -12,11 +12,6 @@ import (
 	"github.com/rivo/tview"
 )
 
-var (
-	session         *discordgo.Session
-	selectedChannel *discordgo.Channel
-	selectedMessage int
-)
 var (
 	boldRegex          = regexp.MustCompile(`(?m)\*\*(.*?)\*\*`)
 	italicRegex        = regexp.MustCompile(`(?m)\*(.*?)\*`)
diff --git a/main.go b/main.go
index 605f2c0..989d34e 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"github.com/ayntgl/discordgo"
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
 	"github.com/zalando/go-keyring"
@@ -8,6 +9,18 @@ import (
 
 const service = "discordo"
 
+var (
+	app               *tview.Application
+	loginForm         *tview.Form
+	channelsTree      *tview.TreeView
+	messagesView      *tview.TextView
+	messageInputField *tview.InputField
+	mainFlex          *tview.Flex
+
+	conf    *config
+	session *discordgo.Session
+)
+
 func main() {
 	conf = loadConfig()
 
diff --git a/ui.go b/ui.go
index b0cfac1..3a0bff3 100644
--- a/ui.go
+++ b/ui.go
@@ -10,12 +10,8 @@ import (
 )
 
 var (
-	app               *tview.Application
-	loginForm         *tview.Form
-	channelsTree      *tview.TreeView
-	messagesView      *tview.TextView
-	messageInputField *tview.InputField
-	mainFlex          *tview.Flex
+	selectedChannel *discordgo.Channel
+	selectedMessage int
 )
 
 func newApp() *tview.Application {