diff --git a/src/main.conf b/src/main.conf
index d605ef4..a94274a 100644
--- a/src/main.conf
+++ b/src/main.conf
# Default adaper name
# %h - substituted for hostname
# %d - substituted for adapter id
-Name = %h-%d
+# Defaults to 'BlueZ'
+#Name = %h-%d
# Default device class. Only the major and minor device class bits are
-# considered.
-Class = 0x000100
+# considered. Defaults to '0x000000'.
+#Class = 0x000100
# How long to stay in discoverable mode before going back to non-discoverable
# The value is in seconds. Default is 180, i.e. 3 minutes.
# 0 = disable timer, i.e. stay discoverable forever
-DiscoverableTimeout = 0
+#DiscoverableTimeout = 0
# How long to stay in pairable mode before going back to non-discoverable
# The value is in seconds. Default is 0.
# 0 = disable timer, i.e. stay pairable forever
-PairableTimeout = 0
+#PairableTimeout = 0
# Automatic connection for bonded devices driven by platform/user events.
# If a platform plugin uses this mechanism, automatic connections will be
# enabled during the interval defined below. Initially, this feature
-# intends to be used to establish connections to ATT channels.
-AutoConnectTimeout = 60
+# intends to be used to establish connections to ATT channels. Default is 60.
+#AutoConnectTimeout = 60
# Use vendor id source (assigner), vendor, product and version information for
# DID profile support. The values are separated by ":" and assigner, VID, PID
# Do reverse service discovery for previously unknown devices that connect to
# us. This option is really only needed for qualification since the BITE tester
# doesn't like us doing reverse SDP for some test cases (though there could in
-# theory be other useful purposes for this too). Defaults to true.
-ReverseServiceDiscovery = true
+# theory be other useful purposes for this too). Defaults to 'true'.
+#ReverseServiceDiscovery = true
# Enable name resolving after inquiry. Set it to 'false' if you don't need
# remote devices name and want shorter discovery cycle. Defaults to 'true'.
-NameResolving = true
+#NameResolving = true
# Enable runtime persistency of debug link keys. Default is false which
# makes debug link keys valid only for the duration of the connection
# that they were created for.
-DebugKeys = false
+#DebugKeys = false