diff --git a/metadata/epub.go b/metadata/epub.go
index 19cda2e..ed0eeb7 100644
--- a/metadata/epub.go
+++ b/metadata/epub.go
@@ -53,10 +53,12 @@ func countEPUBWords(filepath string) (int64, error) {
 	rf := rc.Rootfiles[0]
 
 	var completeCount int64
-	for _, item := range rf.Spine.Itemrefs {
+	for _, item := range rf.Itemrefs {
 		f, _ := item.Open()
 		doc, _ := goquery.NewDocumentFromReader(f)
-		completeCount = completeCount + int64(len(strings.Fields(doc.Text())))
+		doc.Find("script, style, noscript, iframe").Remove()
+		words := len(strings.Fields(doc.Text()))
+		completeCount = completeCount + int64(words)
 	}
 
 	return completeCount, nil
diff --git a/metadata/metadata.go b/metadata/metadata.go
index d3444c2..5ed7d1a 100644
--- a/metadata/metadata.go
+++ b/metadata/metadata.go
@@ -87,7 +87,7 @@ func GetWordCount(filepath string) (*int64, error) {
 		}
 		return &totalWords, nil
 	} else {
-		return nil, fmt.Errorf("Invalid extension: %s", fileExtension)
+		return nil, fmt.Errorf("invalid extension: %s", fileExtension)
 	}
 }