license changed
regex simplification