Move default values to where we define the structure
Improve comments on the various wire version numbers
Rename variable to make it more clear what it means
Rename a variable and improve comments change if()s to switch/case