Tidied up regex
Tidied up regex.

Signed-off-by: Henrik Smederod <henrik@smederod.com>