Tidyup

Use regex for split, not string