clean up the configuration and add some comments to templates