refactored CommentsLogic
refactored ComentsLogicTest
[1973] Clean up CommentsLogic

fixes #1973