Added punctuation and as a result had to abstract out field separators