refactoring, made a delimiter for ","