Fix comments order