Fix comments ordering