cleanup a few structs, remove field access and use properties