Removed type variable from class header

Since the class instantiation won't recognize the return type variable,
I removed it. Also, changed some of the metrics to convert words to
lowercase as it counts. So word and Word are considered the same.