Refactor PartOfSpeech value output
Refactor comments