reformat, amendments to structure tipes