Write the regex slightly nicer