Address @gregcaporaso and @ebolyen's comments