Refactor SeparatedValuesField