Fix comments from review