Make collectd_settings more flexible + minor style fixes