diff --git a/cmd/cmd.go b/cmd/cmd.go
index 6b222c024..73d7f5485 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -1329,12 +1329,12 @@ func chat(cmd *cobra.Command, opts runOptions) (*api.Message, error) {
 		cancel()
 	}()
 
-	var state = &displayResponseState{}
+	state := &displayResponseState{}
 	var thinkingContent strings.Builder
 	var latest api.ChatResponse
 	var fullResponse strings.Builder
-	var thinkTagOpened = false
-	var thinkTagClosed = false
+	thinkTagOpened := false
+	thinkTagClosed := false
 
 	role := "assistant"
 
@@ -1462,10 +1462,10 @@ func generate(cmd *cobra.Command, opts runOptions) error {
 		cancel()
 	}()
 
-	var state = &displayResponseState{}
+	state := &displayResponseState{}
 	var thinkingContent strings.Builder
-	var thinkTagOpened = false
-	var thinkTagClosed = false
+	thinkTagOpened := false
+	thinkTagClosed := false
 
 	plainText := !term.IsTerminal(int(os.Stdout.Fd()))
 
diff --git a/cmd/interactive.go b/cmd/interactive.go
index 37d3afce5..f5f487cac 100644
--- a/cmd/interactive.go
+++ b/cmd/interactive.go
@@ -130,7 +130,7 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
 
 	var sb strings.Builder
 	var multiline MultilineState
-	var thinkExplicitlySet = opts.Think != nil
+	thinkExplicitlySet := opts.Think != nil
 
 	for {
 		line, err := scanner.Readline()
diff --git a/parser/parser.go b/parser/parser.go
index aba843f25..fe1fbda60 100644
--- a/parser/parser.go
+++ b/parser/parser.go
@@ -370,7 +370,7 @@ func (e *ParserError) Error() string {
 func ParseFile(r io.Reader) (*Modelfile, error) {
 	var cmd Command
 	var curr state
-	var currLine = 1
+	currLine := 1
 	var b bytes.Buffer
 	var role string
 
diff --git a/readline/buffer.go b/readline/buffer.go
index 23be30a2e..d5f810d62 100644
--- a/readline/buffer.go
+++ b/readline/buffer.go
@@ -298,7 +298,7 @@ func (b *Buffer) drawRemaining() {
 		remaining := (remainingText[len(currLine):])
 		var totalLines int
 		var displayLength int
-		var lineLength = currLineSpace
+		lineLength := currLineSpace
 
 		for _, c := range remaining {
 			if displayLength == 0 || (displayLength+runewidth.RuneWidth(c))%b.LineWidth < displayLength%b.LineWidth {