minor: no more globals