Moved listed comments logic to proper location