lets remove the duplication of the regex? otherwise, looks ok