Tidied up over-complex regexp (over estimated the greed of .*)