diff --git a/config/mod.go b/config/mod.go
index e7a31ec..f27bf2a 100644
--- a/config/mod.go
+++ b/config/mod.go
@@ -29,8 +29,8 @@ type KeybindingsConfig struct {
 }
 
 type Config struct {
-	General     GeneralConfig     `json:"general"`
 	Keybindings KeybindingsConfig `json:"keybindings"`
+	General     GeneralConfig     `json:"general"`
 }
 
 func New() *Config {
diff --git a/ui/app.go b/ui/app.go
index 5ce202b..3ae288a 100644
--- a/ui/app.go
+++ b/ui/app.go
@@ -12,16 +12,14 @@ import (
 
 type App struct {
 	*tview.Application
-
 	GuildsList        *tview.List
 	ChannelsTreeView  *tview.TreeView
 	MessagesTextView  *tview.TextView
 	MessageInputField *tview.InputField
-
-	Session         *discordgo.Session
-	SelectedChannel *discordgo.Channel
-	SelectedMessage int
-	Config          config.Config
+	Session           *discordgo.Session
+	SelectedChannel   *discordgo.Channel
+	Config            config.Config
+	SelectedMessage   int
 }
 
 func NewApp() *App {
diff --git a/util/discord.go b/util/discord.go
index 05b52d6..bd36c97 100644
--- a/util/discord.go
+++ b/util/discord.go
@@ -58,10 +58,10 @@ func HasPermission(s *discordgo.State, cID string, p int64) bool {
 }
 
 type loginResponse struct {
-	MFA    bool   `json:"mfa"`
-	SMS    bool   `json:"sms"`
 	Ticket string `json:"ticket"`
 	Token  string `json:"token"`
+	MFA    bool   `json:"mfa"`
+	SMS    bool   `json:"sms"`
 }
 
 func Login(s *discordgo.Session, email string, password string) (*loginResponse, error) {