Improve comment and remove unnecessary np.where()