diff --git a/msoleps.go b/msoleps.go
index 9d0665d..209ed02 100644
--- a/msoleps.go
+++ b/msoleps.go
@@ -53,10 +53,7 @@ var (
 
 // IsMSOLEPS checks the first uint16 character of an mscfb name to test if it is a MSOLEPS stream
 func IsMSOLEPS(i uint16) bool {
-	if i == 0x0005 {
-		return true
-	}
-	return false
+	return i == 0x0005
 }
 
 // Reader is a reader for MS OLE Property Set Data structures
diff --git a/msoleps_test.go b/msoleps_test.go
index 801b926..c3614d5 100644
--- a/msoleps_test.go
+++ b/msoleps_test.go
@@ -9,7 +9,6 @@ var (
 	testDocSum = "test/DocumentSummaryInformation"
 	testSum    = "test/SummaryInformation"
 	testSum1   = "test/SummaryInformation1"
-	testBad    = "test/SummaryInformationBad"
 )
 
 func testFile(t *testing.T, path string) *Reader {
diff --git a/sets.go b/sets.go
index 0de79b8..1d5e9ae 100644
--- a/sets.go
+++ b/sets.go
@@ -25,8 +25,8 @@ func addDefaults(m map[uint32]string) map[uint32]string {
 
 }
 
-var propertySets map[types.Guid]map[uint32]string = map[types.Guid]map[uint32]string{
-	types.MustGuidFromString("{D5CDD502-2E9C-101B-9397-08002B2CF9AE}"): map[uint32]string{
+var propertySets = map[types.Guid]map[uint32]string{
+	types.MustGuidFromString("{D5CDD502-2E9C-101B-9397-08002B2CF9AE}"): {
 		0x00000002: "Category",
 		0x00000003: "Presentation Format",
 		0x00000004: "Byte count",
@@ -54,7 +54,7 @@ var propertySets map[types.Guid]map[uint32]string = map[types.Guid]map[uint32]st
 		0x0000001C: "Language",
 		0x0000001D: "Document Version",
 	},
-	types.MustGuidFromString("{F29F85E0-4FF9-1068-AB91-08002B27B3D9}"): map[uint32]string{
+	types.MustGuidFromString("{F29F85E0-4FF9-1068-AB91-08002B27B3D9}"): {
 		0x00000002: "Title",
 		0x00000003: "Subject",
 		0x00000004: "Author",