Address @gregcaporaso comments