comment magic number
Simplify match scoring a bit