* Add todo - Correct logic used to display comment messages