Changed regex and fixed whitespace.