Remove commented out func
Remove some addressed data
Added preferred data types to some struct members
Changes to implement subtypes and preferred struct member types