rework comments section