Update datasource config field types

[insmac]

Update the config fields so that all the numerical ones use number instead of mixing them with strings.

Side changes - automated code formatting.