Rearrange comments based on PR feedback.