Polish bond settings

Could you add comments about the device names here? Or perhaps use constants?