Pretty simple regex to make it more robust no?