diff --git a/convert/convert_test.go b/convert/convert_test.go
index 89c9b544d..abb1c7712 100644
--- a/convert/convert_test.go
+++ b/convert/convert_test.go
@@ -134,8 +134,8 @@ func TestConvertNPZ(t *testing.T) {
 
 	for _, fn := range cases {
 		ts, err := parseNPZ(filepath.Join("testdata", fn))
-		assert.Nil(t, err)
-		assert.Equal(t, 16*2*2, len(ts)) // 16 layers, 2 tensors, 2 loras
+		assert.NoError(t, err)
+		assert.Len(t, ts, 16*2*2) // 16 layers, 2 tensors, 2 loras
 
 		a := adapter{}
 
@@ -143,19 +143,19 @@ func TestConvertNPZ(t *testing.T) {
 			at := m.(adapterTensor)
 			assert.Equal(t, filepath.Join("testdata", fn), at.path)
 			assert.Equal(t, "F32", at.dtype) // only float32s supported
-			assert.Equal(t, 2, len(at.tensorBase.shape))
+			assert.Len(t, at.tensorBase.shape, 2)
 		}
 
 		var ws io.WriteSeeker = &memWriter{}
 		err = llm.WriteGGLA(ws, a.KV(nil), a.Tensors(ts))
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 
 		mw := ws.(*memWriter)
 		slog.Info(fmt.Sprintf("buffer len = %d", len(mw.buf)))
-		assert.NotEqual(t, 0, len(mw.buf))
+		assert.NotEmpty(t, mw.buf)
 		rs := bytes.NewReader(mw.buf)
 		ggml, _, err := llm.DecodeGGML(rs, len(mw.buf))
-		assert.Nil(t, err, "decode ggml failed")
+		assert.NoError(t, err, "decode ggml failed")
 		assert.NotNil(t, ggml, "ggml was empty")
 
 		kv := ggml.KV()
diff --git a/convert/reader_npz.go b/convert/reader_npz.go
index b9cf83eaf..6f434fb3a 100644
--- a/convert/reader_npz.go
+++ b/convert/reader_npz.go
@@ -110,11 +110,9 @@ func (t adapterTensor) WriteTo(w io.Writer) (int64, error) {
 		}
 
 		return 0, binary.Write(w, binary.LittleEndian, f32s)
-	default:
-		return 0, fmt.Errorf("unknown data type: %s", t.dtype)
 	}
 
-	return 0, fmt.Errorf("unknown error")
+	return 0, fmt.Errorf("unknown data type: %s", t.dtype)
 }
 
 func transpose(f32s []float32, shape []uint64) ([]float32, error) {
diff --git a/llm/ggla.go b/llm/ggla.go
index d03886b3a..2c9a9e1ce 100644
--- a/llm/ggla.go
+++ b/llm/ggla.go
@@ -86,7 +86,7 @@ func (llm *ggla) decode(rs io.ReadSeeker) error {
 		var dims uint32
 		if err := binary.Read(rs, binary.LittleEndian, &dims); err != nil {
 			if errors.Is(err, io.EOF) {
-				return nil
+				break
 			}
 			return err
 		}
@@ -180,7 +180,7 @@ func WriteGGLA(ws io.WriteSeeker, kv KV, ts []*Tensor) error {
 
 	for _, t := range ts {
 		dims := 0
-		for cnt := 0; cnt < len(t.Shape); cnt++ {
+		for cnt := range len(t.Shape) {
 			if t.Shape[cnt] > 0 {
 				dims++
 			}
@@ -198,7 +198,7 @@ func WriteGGLA(ws io.WriteSeeker, kv KV, ts []*Tensor) error {
 			return err
 		}
 
-		for cnt := 0; cnt < dims; cnt++ {
+		for cnt := range dims {
 			if err := binary.Write(ws, binary.LittleEndian, uint32(t.Shape[dims-1-cnt])); err != nil {
 				return err
 			}