Refactor to split on a comma instead of a space