minor cleanups
Use strings.Fields() to split fields.