Address review comments @takluyver