Also some cleanups wrt struct member initialization style.
Attach a file by drag & drop or click to upload
