clean up
fix for typedefs of structs