Completed persistence: Unigrams, Bigrams & Trigrams + required refactoring