Finished refactoring commenting. Tested vs. large message file with success.