Formatting changes in config
Formatting updates and some tweaks in review