Fix comments from Reda