moved regex strings out of classes