Changed the delimeter format, Refactoring out some specifics into fewer locations