Add test for Comment section
Implement new logic for Comment section
Minor style change