diff --git a/cmd/doc.go b/cmd/doc.go
index ed3ad65..c49d1ea 100644
--- a/cmd/doc.go
+++ b/cmd/doc.go
@@ -1,2 +1,2 @@
-// package cmd provides the Cobra command-line interface for the TeaQLite application.
+// Package cmd provides the Cobra command-line interface for the TeaQLite application.
 package cmd
diff --git a/internal/app/app.go b/internal/app/app.go
index 00cd9e5..67c8ffb 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"sync/atomic"
 
-	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	_ "modernc.org/sqlite" // Import SQLite driver
 )
@@ -26,7 +26,7 @@ func nextID() int {
 // Common message types
 type blinkMsg struct{}
 
-// KeyMap defines the keybindings for the application
+// AppKeyMap defines the keybindings for the application
 type AppKeyMap struct {
 	Quit    key.Binding
 	Suspend key.Binding
@@ -468,6 +468,7 @@ var (
 )
 
 // Utility functions
+
 func TruncateString(s string, maxLen int) string {
 	if len(s) <= maxLen {
 		return s
diff --git a/internal/app/query.go b/internal/app/query.go
index 22cfc58..ff9572b 100644
--- a/internal/app/query.go
+++ b/internal/app/query.go
@@ -5,10 +5,10 @@ import (
 	"strings"
 	"time"
 
-	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/bubbles/help"
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/textarea"
+	tea "github.com/charmbracelet/bubbletea"
 )
 
 type QueryModel struct {
@@ -110,7 +110,7 @@ func (m *QueryModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		cmds = append(cmds, tea.Tick(time.Millisecond*500, func(t time.Time) tea.Msg {
 			return blinkMsg{}
 		}))
-		
+
 	case tea.KeyMsg:
 		if m.FocusOnInput {
 			return m.handleQueryInput(msg)
@@ -252,9 +252,7 @@ func (m *QueryModel) ensureIDColumns(query string) string {
 
 	// Add primary keys to the beginning
 	var pkList []string
-	for _, pk := range primaryKeys {
-		pkList = append(pkList, pk)
-	}
+	pkList = append(pkList, primaryKeys...)
 
 	newSelectClause := strings.Join(pkList, ", ") + ", " + selectClause
 
@@ -457,4 +455,5 @@ func (m *QueryModel) View() string {
 	}
 
 	return content.String()
-}
\ No newline at end of file
+}
+