Address @takluyver 's review comments