Split on hyphens as well as whitespace