Refactoring - Use regex in split