Separates hash count for char/word
Minor modifications