Some more consistency conversions into the C style of expressing structs
Some more consistency conversions into the C style of expressing structs
Removed extraneous sections