Update config sample, and some formatting