Address review comments: Use ITYPE instead of np.int32. Shorten long lines