Fix comments from feedback