Reverting "Fix indenting."

Revert "Fix indenting."
This reverts commit ffe457c091faad211bb16dce7e40f69dcef45045.
Reverting "Enable batch options to be set in config for internal sync"

Revert "Enable batch options to be set in config for internal sync"
This reverts commit 009f7765f47e88b36766ad7c7cfaccabc539ad45.
Pull batch options from config if not specified

Preference of batch options source:
Opts arg > config:get/3 > hard-coded defaults