Whitespace cleanup
Update example configuration file to new format