Address @takluyver 's comments