Simplify configuration format

Labeling configuration options with comments instead of embedded strings
wherever said strings are not needed by the program is cleaner.