diff --git a/words/scales.txt b/words/scales.txt
index 9b34ab64a..972446330 100644
--- a/words/scales.txt
+++ b/words/scales.txt
@@ -30,28 +30,6 @@ pineapplefish
 anaconda
 puffin
 cardassian
-acoustic
-alpha
-altered
-augmented
-bebop
-beta
-blues
-bushi
-byzantine
-freygish
-phrygian
-chromatic
-delta
-diminished
-dominant
-dorian
-enigmatic
-gamma
-harmonic
-heptatonic
-hirajoshi
-in
 cloud
 nominal
 ordinal
@@ -60,24 +38,6 @@ ratio
 vernier
 lime
 scala
-insen
-istrian
-iwato
-jazz
-locrian
-major
-minor
-musical
-octatonic
-pentatonic
-pierce
-prometheus
-pythagorean
-symmetric
-tet
-tone
-tritone
-yo
 boa
 cobra
 richter
@@ -147,3 +107,48 @@ mudpuppy
 gopher
 chickadee
 toad
+
+# Musical scales
+acoustic
+alpha
+altered
+augmented
+bebop
+beta
+blues
+bushi
+byzantine
+chromatic
+delta
+diatonic
+diminished
+dominant
+dorian
+enigmatic
+freygish
+gamma
+harmonic
+heptatonic
+hexatonic
+hirajoshi
+in
+insen
+istrian
+iwato
+jazz
+locrian
+major
+minor
+mixolydian
+musical
+octatonic
+pentatonic
+phrygian
+pierce
+prometheus
+pythagorean
+symmetric
+tet
+tone
+tritone
+yo
diff --git a/words/words.go b/words/words.go
index 6668249f7..72aa142ce 100644
--- a/words/words.go
+++ b/words/words.go
@@ -49,7 +49,7 @@ func parseWords(txt []byte) []string {
 		if i != -1 {
 			word, txt = word[:i], txt[i+1:]
 		}
-		if word := strings.TrimSpace(string(word)); word != "" {
+		if word := strings.TrimSpace(string(word)); word != "" && word[0] != '#' {
 			ret = append(ret, word)
 		}
 	}