Minor: generalize