Change series attributes to a more sensible format
Clean up some whitespace