Minor tweaks. Change batching setup to use configuration.
Whitespace fixes (R# code cleanup)