improve regex parterns