update regex to avoid regex hell