diff --git a/packageurl.go b/packageurl.go
index 5790520..bff4d2d 100644
--- a/packageurl.go
+++ b/packageurl.go
@@ -106,7 +106,7 @@ func QualifiersFromMap(mm map[string]string) Qualifiers {
 
 // Map converts a Qualifiers struct to a string map.
 func (qq Qualifiers) Map() map[string]string {
-	m := make(map[string]string, 0)
+	m := make(map[string]string)
 
 	for i := 0; i < len(qq); i++ {
 		k := qq[i].Key
diff --git a/packageurl_test.go b/packageurl_test.go
index 85084a3..f4e767d 100644
--- a/packageurl_test.go
+++ b/packageurl_test.go
@@ -70,7 +70,7 @@ func (m *OrderedMap) UnmarshalJSON(bytes []byte) error {
 	switch data {
 	case "null":
 		m.OrderedKeys = []string{}
-		m.Map = make(map[string]string, 0)
+		m.Map = make(map[string]string)
 		return nil
 	default:
 		// ensure that the data is a json object "{...}"
@@ -90,7 +90,6 @@ func (m *OrderedMap) UnmarshalJSON(bytes []byte) error {
 					return fmt.Errorf("qualifiers parse error: expected delimiter '}', got: %v", token)
 				}
 				// closed json object -> we're done
-				break
 			case string:
 				// this token is a dictionary key
 				m.OrderedKeys = append(m.OrderedKeys, token)
@@ -250,7 +249,7 @@ func TestStringer(t *testing.T) {
 		}
 
 		// Verify that the %s format modifier works for values.
-		fmtStr := fmt.Sprintf("%s", purlValue)
+		fmtStr := purlValue.String()
 		if fmtStr != purlPtr.String() {
 			t.Logf("%s failed: %%s format modifier does not work on values: %s != %s", tc.Description, fmtStr, purlPtr.ToString())
 			t.Fail()