Fix comments to adhere go standard better